From: Dave Airlie <airlied@redhat.com>
Date: Mon, 7 Dec 2009 21:03:55 +0000 (+1000)
Subject: Merge remote branch 'origin/drm-core-next' into test
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~19409^2~84^2~21
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=f84676185368e36c6bc0eeab87ab73ed39042648;p=linux-4.9.git

Merge remote branch 'origin/drm-core-next' into test

Conflicts:
	drivers/gpu/drm/drm_fb_helper.c
---

f84676185368e36c6bc0eeab87ab73ed39042648